1 Compare/Merge Tools

Compare/Merge tools allow you to compare multiple versions of the same text file (line-by-line) and create a merged/rationalized version.

2 Version Control Tools

Version/revision controltools allow individual programmers and teams to manage code as it is developed and as it is revised.